projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afe3cf6 d535ea2)
bitkeeper revision 1.1236.43.2 (4242f87aFPws_0qJOowxni3KubXdbQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 24 Mar 2005 17:27:22 +0000 (17:27 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 24 Mar 2005 17:27:22 +0000 (17:27 +0000)
Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.